From e6b492fa35ade979eb2f95506902de54a89d68f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Wed, 15 Nov 2006 19:33:52 +0000 Subject: [PATCH] Set the default BABL_PATH based on the prefix babl is compiled for. * babl/Makefile.am: * babl/babl-extension.c: --- ChangeLog | 7 +++++++ babl/Makefile.am | 2 ++ babl/babl-extension.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 30f1f05..305f633 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-11-15 Øyvind Kolås + + Set the default BABL_PATH based on the prefix babl is compiled for. + + * babl/Makefile.am: + * babl/babl-extension.c: + 2006-11-07 Øyvind Kolås * extensions/CIE-Lab.c: (formats): added "CIE Lab alpha float" as diff --git a/babl/Makefile.am b/babl/Makefile.am index ffc0338..81b28f9 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -46,6 +46,8 @@ library_include_HEADERS = \ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base +AM_CPPFLAGS = -DPREFIX=\""$(prefix)"\" + lib_LTLIBRARIES= libbabl.la libbabl_la_SOURCES= $(h_sources) $(c_sources) libbabl_la_LIBADD=\ diff --git a/babl/babl-extension.c b/babl/babl-extension.c index 2352586..812e405 100644 --- a/babl/babl-extension.c +++ b/babl/babl-extension.c @@ -22,7 +22,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #else -#define BABL_PATH "~/.babl-0.0:/usr/local/lib/babl-0.0:/usr/lib/babl-0.0"; +#define BABL_PATH PREFIX "/babl-0.0" #define BABL_PATH_SEPERATOR "/" #define BABL_LIST_SEPERATOR ':' #endif -- 2.30.2